fix: removed unnecessary comment, refactored json tag launched

client/src/layouts/default/AppBar.vue

@@ -162,8 +162,6 @@ export default {
 			if (title == "Logout") {
 				localStorage.removeItem("token");
 				localStorage.removeItem("username");
-				// localStorage.removeItem("nextlaunch");
-				// localStorage.setItem("nextlaunch", "true");
 				items.value = [
 					{
 						path: "about",

client/src/layouts/default/Default.vue

@@ -29,7 +29,6 @@ export default {
     const router = useRouter();
     const maintenance = ref(false);
     const nextlaunch = ref(true);
-    // const nextlaunchflag = ref(true);
     const noQuota = ref(false);
     const excludedRoutes = ref([
       "/",
@@ -44,7 +43,6 @@ export default {
     userService.maintenance();
     maintenance.value = localStorage.getItem("maintenance") == "true";
 
-    // userService.nextlaunch();
     nextlaunch.value = localStorage.getItem("nextlaunch") == "true";
 
     const isAdmin = computed(() => {

client/src/router/index.js

@@ -180,10 +180,8 @@ const router = createRouter({
 router.beforeEach(async (to, from, next) => {
   let token = localStorage.getItem("token");
   userService.maintenance();
-  // userService.nextlaunch();
 
   if (to.meta.requiredAuth && !token) {
-    // userService.nextlaunch();
     next("/login");
   } else if (to.path == "/" && token) {
     await userService.refresh_token();

client/src/services/userService.js

@@ -202,12 +202,11 @@ export default {
 
   // next launch
   async nextlaunch() {
-      // await this.refresh_token();
       return await baseClient()
         .get("/nextlaunch")
         .then((response) => {
           const { data } = response.data;
-          localStorage.setItem("nextlaunch", data.active);
+          localStorage.setItem("nextlaunch", data.launched);
         })
         .catch((response) => {
           const { err } = response.response.data;
@@ -223,9 +222,6 @@ export default {
         if (isAdmin) {
           localStorage.setItem("nextlaunch", "true");
         }
-        //  else {
-        //   this.nextlaunch();
-        // }
       })
   },
 };

client/src/views/Login.vue

@@ -100,8 +100,6 @@ import axios from "axios";
 import Toast from "@/components/Toast.vue";
 import { useRouter } from "vue-router";
 import userService from "@/services/userService";
-// import userService from "@/services/userService";
-// import NextLaunch from "./NextLaunch.vue";
 
 export default {
   components: {
@@ -142,24 +140,9 @@ export default {
           localStorage.setItem("token", response.data.data.access_token);
           toast.value.toast(response.data.msg);
           adminCheck();
-          // userService.handleNextLaunch();
-          // userService.getUser()
-          // .then((response) => {
-          //   const { user } = response.data.data;
-          //   const isAdmin = user.admin;
-          //   if (isAdmin) {
-          //     localStorage.setItem("nextlaunch", "true");
-          //   }
-          // })
-          // if(localStorage.getItem("nextlaunch") == "true") {
             router.push({
             name: "Home",
           });
-          // } else{
-          //   router.push({
-          //     name: "NextLaunch",
-          //   })
-          // }
         })
         .catch((error) => {
           toast.value.toast(error.response.data.err, "#FF5252");

server/app/admin_handler.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/codescalers/cloud4students/internal"
-	// "github.com/codescalers/cloud4students/middlewares"
 	"github.com/codescalers/cloud4students/models"
 	"github.com/rs/zerolog/log"
 	"gopkg.in/validator.v2"

server/app/app.go

@@ -106,7 +106,6 @@ func (a *App) registerHandlers() {
 	notificationRouter := authRouter.PathPrefix("/notification").Subrouter()
 	vmRouter := authRouter.PathPrefix("/vm").Subrouter()
 	k8sRouter := authRouter.PathPrefix("/k8s").Subrouter()
-	// authNextLaunchRouter := authRouter.PathPrefix("/nextlaunch").Subrouter()
 
 	// sub routes with no authorization
 	unAuthUserRouter := versionRouter.PathPrefix("/user").Subrouter()
@@ -127,8 +126,6 @@ func (a *App) registerHandlers() {
 	unAuthUserRouter.HandleFunc("/forgot_password", WrapFunc(a.ForgotPasswordHandler)).Methods("POST", "OPTIONS")
 	unAuthUserRouter.HandleFunc("/forget_password/verify_email", WrapFunc(a.VerifyForgetPasswordCodeHandler)).Methods("POST", "OPTIONS")
 
-	// authMaintenanceRouter.HandleFunc("/maintenance", WrapFunc(a.GetMaintenanceHandler)).Methods("GET", "OPTIONS")
-
 	userRouter.HandleFunc("/change_password", WrapFunc(a.ChangePasswordHandler)).Methods("PUT", "OPTIONS")
 	userRouter.HandleFunc("", WrapFunc(a.UpdateUserHandler)).Methods("PUT", "OPTIONS")
 	userRouter.HandleFunc("", WrapFunc(a.GetUserHandler)).Methods("GET", "OPTIONS")
@@ -163,7 +160,6 @@ func (a *App) registerHandlers() {
 	adminRouter.HandleFunc("/deployment/count", WrapFunc(a.GetDlsCountHandler)).Methods("GET", "OPTIONS")
 	adminRouter.HandleFunc("/announcement", WrapFunc(a.CreateNewAnnouncement)).Methods("POST", "OPTIONS")
 	adminRouter.HandleFunc("/set_admin", WrapFunc(a.SetAdmin)).Methods("PUT", "OPTIONS")
-	// adminRouter.HandleFunc("/nextlaunch", WrapFunc(a.GetNextLaunchAdminHandler)).Methods("GET", "OPTIONS")
 	balanceRouter.HandleFunc("", WrapFunc(a.GetBalanceHandler)).Methods("GET", "OPTIONS")
 	maintenanceRouter.HandleFunc("", WrapFunc(a.UpdateMaintenanceHandler)).Methods("PUT", "OPTIONS")
 	deploymentsRouter.HandleFunc("", WrapFunc(a.DeleteAllDeployments)).Methods("DELETE", "OPTIONS")

server/models/nextlaunch.go

@@ -5,6 +5,6 @@ import "time"
 // NextLaunch struct for next launch revealing
 type NextLaunch struct {
 	ID        int       `json:"id" gorm:"primaryKey"`
-	Launched  bool      `json:"active"`
+	Launched  bool      `json:"launched"`
 	UpdatedAt time.Time `json:"updated_at"`
 }