new post - updated server directories

server/controller/redirect.go

@@ -11,7 +11,7 @@ func DiscordRedirect(w http.ResponseWriter, r *http.Request, _ httprouter.Params
 	http.Redirect(w, r, "https://discordapp.com/invite/0Z2tzxKECEj2BHwj", 301)
 }
 
-// Redirect to discord
+// Redirect to vpn
 func VPNRedirect(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 	http.Redirect(w, r, "https://mitchel.io:943", 301)
 }

server/model/raw_sensor/raw_sensor.go

@@ -34,6 +34,7 @@ func (s *Data) toJson() string {
 
 }
 
+//default store structure
 func (s *Data) StoreData() error {
 
 	if db.Mongo.Connected() {
@@ -57,13 +58,13 @@ func (s *Data) StoreData() error {
 }
 
 //handle queries for all sensors page
-//********************************************************************************
 type DataStore_AllSensors struct {
 	ID          string    `json:"location" bson:"_id"`
 	Temperature float64   `json:"temperature" bson:"temperature"`
 	Updated     time.Time `json:"updated" bson:"updated"`
 }
 
+//get latest update from each unique sensor
 func GetAllSensors() ([]DataStore_AllSensors, error) {
 
 	s := []DataStore_AllSensors{}
@@ -88,52 +89,4 @@ func GetAllSensors() ([]DataStore_AllSensors, error) {
 	} else {
 		return s, errors.New("Query failed")
 	}
-}
-
-//********************************************************************************
-
-//get sensor information by location
-//********************************************************************************
-type DataStore_SensorByLocation struct {
-	Id sensorByLocation `json:"_id" bson:"_id"`
-}
-
-type sensorByLocation struct {
-	Year     int    `json:"year" bson:"year"`
-	Month    int    `json:"month" bson:"month"`
-	Location string `json:"location" bson:"location"`
-}
-
-/*
-func GetSensorInfoByLocation(sensor_location string) ([]DataStore_SensorByLocation, error) {
-	s := []DataStore_SensorByLocation{}
-	if db.Mongo.Connected() == true {
-		session := db.Mongo.Session.Copy()
-		defer session.Close()
-		c := session.DB(db.Mongo.Info.Database).C(collection)
-		err := c.Pipe([]bson.M{{"$project": bson.M{"location": "$location", "year": bson.M{"$year": "$updated"}, "month": bson.M{"$month": "$updated"}}},
-			bson.M{"$match": bson.M{"location": sensor_location}},
-			bson.M{"$group": bson.M{"_id": bson.M{"year": "$year", "month": "$month", "location": "$location"}}},
-			bson.M{"$sort": bson.M{"_id.year": -1, "_id.month": -1}}}).All(&s)
-		if err != nil {
-			log.Println(err)
-			return s, nil
-		}
-		return s, nil
-	} else {
-		return s, errors.New("Query failed")
-	}
-}
-*/
-
-//********************************************************************************
-
-/*************************
-testStore := model.SensorData{
-		ID:          bson.NewObjectId(),
-		Temperature: 34.2,
-		Humidity:    33.22,
-		Location:    "Grand Meadow",
-		Updated:     time.Now(),
-}
-**************************/
+}

server/mywebsite.go

@@ -0,0 +1,28 @@
+package main
+
+import (
+	"log"
+	"net/http"
+	"strconv"
+	"github.com/NYTimes/gziphandler"
+	
+	"mywebsite/server/controller/api"
+	"mywebsite/server/db"
+	"mywebsite/server/route"
+	"mywebsite/server/utils"
+)
+
+func main(){
+	configurations := utils.ReadConfig()
+
+	db.Configure(configurations.Database)
+	api.Configure(configurations.Api)
+
+	db.Mongo.Connect()
+	
+	//register middleware
+	handle := gziphandler.GzipHandler(route.Routes())
+	
+	log.Println("Starting Server...")
+	log.Println(http.ListenAndServe(":"+strconv.Itoa(configurations.Port), handle))
+}

server/utils/config.go

@@ -14,7 +14,7 @@ import (
 type Config struct {
 	Database db.DatabaseInfo `json:"database"`
 	Api      api.ApiInfo     `json:"api"`
-	Port		 int						 `json:"port"`
+	Port     int		 `json:"port"`
 }
 
 //read the config file and return JsonObject struct