History of geometry
Classic geometry was focused in compass and straightedge constructions. Geometry was revolutionized by Euclid, who introduced mathematical rigor and the axiomatic method still in use today. His book, "The Elements" is widely considered the most influential textbook of all time, and was known to all educated people in the West until the middle of the 20th century.
Foundations of geometry
Foundations of geometry is the study of geometries as axiomatic systems. There are several sets of axioms which give rise to Euclidean geometry or to non-Euclidean geometries. These are fundamental to the study and of historical importance, but there are a great many modern geometries that are not Euclidean which can be studied from this viewpoint. The term axiomatic geometry can be applied to any geometry that is developed from an axiom system, but is often used to mean Euclidean geometry studied from this point of view. The completeness and independence of general axiomatic systems are important mathematical considerations, but there are also issues to do with the teaching of geometry which come into play.