diff --git a/db/chart.store.go b/db/chart.store.go deleted file mode 100644 index 1642905..0000000 --- a/db/chart.store.go +++ /dev/null @@ -1,30 +0,0 @@ -package db - -import ( - "cpone/package/database" - "database/sql" - - _ "github.com/glebarez/go-sqlite" -) - -type PieChartStore struct { - Db *sql.DB -} -type BarChartStore struct { - Db *sql.DB -} - -func NewPieChartStore(dbName string) (PieChartStore, error) { - Db := database.Handle - - return PieChartStore{ - Db, - }, nil -} -func NewBarChartStore(dbName string) (BarChartStore, error) { - Db := database.Handle - - return BarChartStore{ - Db, - }, nil -} diff --git a/db/employee.store.go b/db/employee.store.go deleted file mode 100644 index 13cd3aa..0000000 --- a/db/employee.store.go +++ /dev/null @@ -1,20 +0,0 @@ -package db - -import ( - "cpone/package/database" - "database/sql" - - _ "github.com/glebarez/go-sqlite" -) - -type EmployeeStore struct { - Db *sql.DB -} - -func NewEmployeeStore(dbName string) (EmployeeStore, error) { - Db := database.Handle - - return EmployeeStore{ - Db, - }, nil -} diff --git a/db/landingpage.store.go b/db/landingpage.store.go deleted file mode 100644 index 7915a34..0000000 --- a/db/landingpage.store.go +++ /dev/null @@ -1,20 +0,0 @@ -package db - -import ( - "cpone/package/database" - "database/sql" - - _ "github.com/glebarez/go-sqlite" -) - -type LandingPageStore struct { - Db *sql.DB -} - -func NewLandingPageStore(dbName string) (LandingPageStore, error) { - Db := database.Handle - - return LandingPageStore{ - Db, - }, nil -} diff --git a/db/login.store.go b/db/login.store.go deleted file mode 100644 index 3507857..0000000 --- a/db/login.store.go +++ /dev/null @@ -1,20 +0,0 @@ -package db - -import ( - "cpone/package/database" - "database/sql" - - _ "github.com/glebarez/go-sqlite" -) - -type LoginStore struct { - Db *sql.DB -} - -func NewLoginStore(dbName string) (LoginStore, error) { - Db := database.Handle - - return LoginStore{ - Db, - }, nil -} diff --git a/db/mastermenuusergroup.go b/db/mastermenuusergroup.go deleted file mode 100644 index 23bb4f0..0000000 --- a/db/mastermenuusergroup.go +++ /dev/null @@ -1,20 +0,0 @@ -package db - -import ( - "cpone/package/database" - "database/sql" - - _ "github.com/glebarez/go-sqlite" -) - -type MasterMenuUserGroupStore struct { - Db *sql.DB -} - -func NewMasterMenuUserGroupStore(dbName string) (MasterMenuUserGroupStore, error) { - Db := database.Handle - - return MasterMenuUserGroupStore{ - Db, - }, nil -} diff --git a/db/xsample.store.go b/db/xsample.store.go deleted file mode 100644 index 2b7811f..0000000 --- a/db/xsample.store.go +++ /dev/null @@ -1,20 +0,0 @@ -package db - -import ( - "cpone/package/database" - "database/sql" - - _ "github.com/glebarez/go-sqlite" -) - -type XsampleStore struct { - Db *sql.DB -} - -func NewXsampleStore(dbName string) (XsampleStore, error) { - Db := database.Handle - - return XsampleStore{ - Db, - }, nil -} diff --git a/handlers/routes.go b/handlers/routes.go index 721bab0..56b323c 100644 --- a/handlers/routes.go +++ b/handlers/routes.go @@ -7,6 +7,7 @@ import ( public_handlers "cpone/handlers/public" client_services "cpone/services/client" corporate_services "cpone/services/corporate" + dev_services "cpone/services/dev" public_services "cpone/services/public" "cpone/db" @@ -176,4 +177,10 @@ func SetupRoutesClient(app *echo.Echo, appStore db.AppStore) { public.GET("/transaksi/samplestation", txSampleStationHandler.ShowTransaksiSampleStation) } -func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {} +func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) { + dev := app.Group("/dev") + + dvlpserv := dev_services.NewServicesLandingPage(appStore) + devlphan := dev_handlers.NewLandingPageHandler(dvlpserv) + dev.GET("/landingpage", devlphan.ShowLandingPage) +} diff --git a/services/dev/chart.services.go b/services/dev/chart.services.go index f381331..bcaf71e 100644 --- a/services/dev/chart.services.go +++ b/services/dev/chart.services.go @@ -6,7 +6,7 @@ import ( "cpone/db" ) -func NewServicesPiechart(u Piechart, b Barchart, uStore db.PieChartStore, bStore db.BarChartStore) *ServicesPiechart { +func NewServicesPiechart(u Piechart, b Barchart, uStore db.AppStore, bStore db.AppStore) *ServicesPiechart { return &ServicesPiechart{ Piechart: u, @@ -126,8 +126,8 @@ type Piechart struct { type ServicesPiechart struct { Piechart Piechart Barchart Barchart - BarChartStore db.BarChartStore - PieChartStore db.PieChartStore + BarChartStore db.AppStore + PieChartStore db.AppStore } // func (su *ServicesPiechart) GetAllXsamples() ([]Piechart, error) { diff --git a/services/dev/employee.services.go b/services/dev/employee.services.go index 857a2c2..bbc69db 100644 --- a/services/dev/employee.services.go +++ b/services/dev/employee.services.go @@ -6,7 +6,7 @@ import ( "cpone/db" ) -func NewServicesEmployee(u Employee, uStore db.EmployeeStore) *ServicesEmployee { +func NewServicesEmployee(u Employee, uStore db.AppStore) *ServicesEmployee { return &ServicesEmployee{ Employee: u, @@ -31,7 +31,7 @@ type EmployeeService struct { type ServicesEmployee struct { Employee Employee - EmployeeStore db.EmployeeStore + EmployeeStore db.AppStore } func (se *ServicesEmployee) GetEmployeeService() ([]EmployeeService, error) { diff --git a/services/dev/landingpage.services.go b/services/dev/landingpage.services.go index f053687..a13f9fc 100644 --- a/services/dev/landingpage.services.go +++ b/services/dev/landingpage.services.go @@ -6,10 +6,10 @@ import ( "cpone/db" ) -func NewServicesLandingPage(u LandingPage, uStore db.LandingPageStore) *ServicesLandingPage { +func NewServicesLandingPage(uStore db.AppStore) *ServicesLandingPage { return &ServicesLandingPage{ - LandingPage: u, + LandingPageStore: uStore, } } @@ -54,7 +54,7 @@ type FooterNav struct { type ServicesLandingPage struct { LandingPage LandingPage - LandingPageStore db.LandingPageStore + LandingPageStore db.AppStore } func (su *ServicesLandingPage) GetAllLandingPages() ([]LandingPage, error) { diff --git a/services/dev/login.services.go b/services/dev/login.services.go index 0e8d8a1..4fceaf6 100644 --- a/services/dev/login.services.go +++ b/services/dev/login.services.go @@ -6,7 +6,7 @@ import ( "cpone/db" ) -func NewServicesLogin(u Login, uStore db.LoginStore) *ServicesLogin { +func NewServicesLogin(u Login, uStore db.AppStore) *ServicesLogin { return &ServicesLogin{ Login: u, @@ -24,7 +24,7 @@ type Login struct { type ServicesLogin struct { Login Login - LoginStore db.LoginStore + LoginStore db.AppStore } func (su *ServicesLogin) GetLogin(Email string, Password string) (Login, error) { diff --git a/services/dev/mastermenuusergroup.services.go b/services/dev/mastermenuusergroup.services.go index e7a04cb..d585eac 100644 --- a/services/dev/mastermenuusergroup.services.go +++ b/services/dev/mastermenuusergroup.services.go @@ -9,7 +9,7 @@ import ( "cpone/utils" ) -func NewServicesMasterMenuUserGroup(u MasterMenu, uStore db.MasterMenuUserGroupStore) *ServicesMasterMenuUserGroup { +func NewServicesMasterMenuUserGroup(u MasterMenu, uStore db.AppStore) *ServicesMasterMenuUserGroup { return &ServicesMasterMenuUserGroup{ MasterMenu: u, @@ -43,7 +43,7 @@ type MasterMenu struct { type ServicesMasterMenuUserGroup struct { MasterMenu MasterMenu - MasterMenuUserGroupStore db.MasterMenuUserGroupStore + MasterMenuUserGroupStore db.AppStore } type AutoComplete struct { diff --git a/services/dev/xsample.services.go b/services/dev/xsample.services.go index 120ca7d..2ce9699 100644 --- a/services/dev/xsample.services.go +++ b/services/dev/xsample.services.go @@ -6,7 +6,7 @@ import ( "cpone/db" ) -func NewServicesXsample(u Xsample, uStore db.XsampleStore) *ServicesXsample { +func NewServicesXsample(u Xsample, uStore db.AppStore) *ServicesXsample { return &ServicesXsample{ Xsample: u, @@ -23,7 +23,7 @@ type Xsample struct { type ServicesXsample struct { Xsample Xsample - XsampleStore db.XsampleStore + XsampleStore db.AppStore } func (su *ServicesXsample) GetAllXsamples() ([]Xsample, error) {