GitHub：[Liu-Yun-Syuan](https://github.com/Liu-Yun-Syuan)
+
+- Project Management 專案管理
+- Permission Settings 權限設定
+- Calendar Integration 行事曆串接
+- Responsive Web Design (RWD) 響應式網頁設計
+
+### 劉怡萍 (Arance Liu)
+
+ GitHub：[AranceLiu](https://github.com/AranceLiu)
+
+- Calendar Features 行事曆功能
+- CSV Import CSV 匯入
+- Project Search 專案搜尋
+- Map Integration 地圖串接
+
+### 趙奕寰 (Tim Chao)
+
+ GitHub：[TimChaoTW](https://github.com/TimChaoTW)
+
+- Communication Chatroom 即時聊天室
+- Text Styles 文字樣式
+- Avatar Upload 頭像上傳
+- Payment Integration 金流串接
+
+### 林韋如 (Ruby Lin)
+
+ GitHub：[ryoma510260](https://github.com/ryoma510260)
+
+- Multilingual Support 支援多國語言
+- Member System 會員系統
+- Website Deployment 網站部署
+- AWS S3 Integration AWS S3 串接
diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
index 1b1506dc..88dcf011 100644
--- a/app/assets/stylesheets/application.tailwind.css
+++ b/app/assets/stylesheets/application.tailwind.css
@@ -23,10 +23,10 @@ html {
}
.form-text {
- @apply block mb-2 text-sm font-medium text-gray-900 dark:text-white;
+ @apply block mb-2 text-sm font-medium text-white text-gray-900;
}
.form-input {
- @apply bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500;
+ @apply bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5;
}
.form-toggle-layer-1 {
@@ -34,15 +34,15 @@ html {
}
.form-toggle-layer-3 {
- @apply text-sm font-medium text-gray-900 ms-3 dark:text-gray-300;
+ @apply text-sm font-medium text-gray-900 ms-3;
}
.form-btn {
- @apply inline-flex items-center px-5 py-2.5 text-sm font-medium text-center text-white bg-blue-700 rounded-lg hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800;
+ @apply inline-flex items-center px-5 py-2.5 text-sm font-medium text-center text-white bg-blue-700 rounded-lg hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300;
}
.form-d-btn {
- @apply block py-2.5 px-5 text-white text-sm font-medium focus:outline-none bg-gray-600 rounded-lg border border-gray-200 hover:bg-gray-900 focus:z-10 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700;
+ @apply block py-2.5 px-5 text-white text-sm font-medium focus:outline-none bg-gray-600 rounded-lg border border-gray-200 hover:bg-gray-900 focus:z-10 focus:ring-4 focus:ring-gray-200;
}
.msg-form {
diff --git a/app/controllers/hrs_controller.rb b/app/controllers/hrs_controller.rb
index 85aa420b..c8c3ea81 100644
--- a/app/controllers/hrs_controller.rb
+++ b/app/controllers/hrs_controller.rb
@@ -8,33 +8,48 @@ def index
authorize current_company, policy_class: HrsPolicy
@users = User.where(company: current_company).order(id: :desc)
@user = User.new
+ respond_to do |format|
+ format.html { render :index }
+ format.json { render json: @user, status: :ok }
+ end
end
def create
@user = User.new(user_params)
- if @user.save
- project = Project.create(title: I18n.t('template.project'), owner_id: @user.id)
- @user.affiliated_projects << project
- list = project.lists.create(title: I18n.t('template.list'), color: '#4299E1')
- list.tasks.create(title: I18n.t('template.task1'), started_at: Date.current, ended_at: Date.current + 1)
- list.tasks.create(title: I18n.t('template.task2'), started_at: Date.current, ended_at: Date.current + 1)
- redirect_to hrs_path, success: t('hrs.creation_success')
- else
- redirect_to hrs_path, alert: t('hrs.creation_failed')
+
+ respond_to do |format|
+ if @user.save
+ project = Project.create(title: I18n.t('template.project'), owner_id: @user.id)
+ @user.affiliated_projects << project
+ list = project.lists.create(title: I18n.t('template.list'), color: '#4299E1')
+ list.tasks.create(title: I18n.t('template.task1'), started_at: Date.current, ended_at: Date.current + 1)
+ list.tasks.create(title: I18n.t('template.task2'), started_at: Date.current, ended_at: Date.current + 1)
+ format.html { redirect_to hrs_path, success: t('hrs.creation_success') }
+ format.json { render json: @user, status: :ok }
+ else
+ format.html { redirect_to hrs_path, alert: t('hrs.creation_failed') }
+ format.json { render json: @user.errors, status: :unprocessable_entity }
+ end
end
end
def update
- if @user.update(user_params)
- redirect_to hrs_path, success: t('hrs.update_success')
- else
- redirect_to hrs_path, alert: t('hrs.update_failed')
+ @user = User.find(params[:id])
+
+ respond_to do |format|
+ if @user.update(user_params)
+ format.html { redirect_to hrs_path, success: t('hrs.update_success') }
+ format.json { render json: @user, status: :ok }
+ else
+ format.html { redirect_to hrs_path, alert: t('hrs.update_failed') }
+ format.json { render json: @user.errors, status: :unprocessable_entity }
+ end
end
end
def destroy
@user.destroy
- redirect_to hrs_path, success: t('hrs.delete_staff')
+ respond_to.html { redirect_to hrs_path, success: t('hrs.update_success') }
end
private
diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js
index 8121a1f2..12009f5c 100644
--- a/app/javascript/controllers/index.js
+++ b/app/javascript/controllers/index.js
@@ -2,37 +2,37 @@
// Run that command whenever you add a new controller or create them with
// ./bin/rails generate stimulus controllerName
-import { application } from "./application"
+import { application } from "./application";
-import CalendarController from "./calendar_controller"
-application.register("calendar", CalendarController)
+import CalendarController from "./calendar_controller";
+application.register("calendar", CalendarController);
-import ColorPickerController from "./color_picker_controller"
-application.register("color-picker", ColorPickerController)
+import ColorPickerController from "./color_picker_controller";
+application.register("color-picker", ColorPickerController);
-import DatepickerController from "./datepicker_controller"
-application.register("datepicker", DatepickerController)
+import DatepickerController from "./datepicker_controller";
+application.register("datepicker", DatepickerController);
-import EventController from "./event_controller"
-application.register("event", EventController)
+import EventController from "./event_controller";
+application.register("event", EventController);
-import MapController from "./map_controller"
-application.register("map", MapController)
+import MapController from "./map_controller";
+application.register("map", MapController);
-import NotificationController from "./notification_controller"
-application.register("notification", NotificationController)
+import NotificationController from "./notification_controller";
+application.register("notification", NotificationController);
-import ResetFormController from "./reset_form_controller"
-application.register("reset-form", ResetFormController)
+import ResetFormController from "./reset_form_controller";
+application.register("reset-form", ResetFormController);
-import SlimselectController from "./slimselect_controller"
-application.register("slimselect", SlimselectController)
+import SlimselectController from "./slimselect_controller";
+application.register("slimselect", SlimselectController);
-import SortableController from "./sortable_controller"
-application.register("sortable", SortableController)
+import SortableController from "./sortable_controller";
+application.register("sortable", SortableController);
-import TurbomodalController from "./turbomodal_controller"
-application.register("turbomodal", TurbomodalController)
+import TurbomodalController from "./turbomodal_controller";
+application.register("turbomodal", TurbomodalController);
import ChatroomListController from "./chatroom_list_controller";
application.register("chatroom_list", ChatroomListController);
diff --git a/app/javascript/lib/fontawesome.js b/app/javascript/lib/fontawesome.js
index 8c807ee2..1fbd6224 100644
--- a/app/javascript/lib/fontawesome.js
+++ b/app/javascript/lib/fontawesome.js
@@ -1,31 +1,32 @@
-import { library, dom } from '@fortawesome/fontawesome-svg-core'
-import { faEllipsis } from '@fortawesome/free-solid-svg-icons/faEllipsis'
-import { faBuilding } from '@fortawesome/free-solid-svg-icons/faBuilding'
-import { faUser } from '@fortawesome/free-solid-svg-icons/faUser'
-import { faPlus } from '@fortawesome/free-solid-svg-icons/faPlus'
-import { faAngleRight } from '@fortawesome/free-solid-svg-icons/faAngleRight'
-import { faAngleLeft } from '@fortawesome/free-solid-svg-icons/faAngleLeft'
-import { faChartSimple } from '@fortawesome/free-solid-svg-icons/faChartSimple'
-import { faLocationDot } from '@fortawesome/free-solid-svg-icons/faLocationDot'
-import { faCheck } from '@fortawesome/free-solid-svg-icons/faCheck'
-import { faAnglesUp } from '@fortawesome/free-solid-svg-icons/faAnglesUp'
-import { faPen } from '@fortawesome/free-solid-svg-icons/faPen'
-import { faPenToSquare as faPenToSquareSolid } from '@fortawesome/free-solid-svg-icons/faPenToSquare'
-import { faCalendar } from '@fortawesome/free-regular-svg-icons/faCalendar'
-import { faTrashCan } from '@fortawesome/free-regular-svg-icons/faTrashCan'
-import { faPenToSquare as faPenToSquareRegular } from '@fortawesome/free-regular-svg-icons/faPenToSquare'
-import { faCircleChevronLeft } from '@fortawesome/free-solid-svg-icons/faCircleChevronLeft'
-import { faCrown } from '@fortawesome/free-solid-svg-icons/faCrown'
-import { faAlignJustify } from '@fortawesome/free-solid-svg-icons/faAlignJustify'
-import { faHourglassStart } from '@fortawesome/free-solid-svg-icons/faHourglassStart'
-import { faMessage } from '@fortawesome/free-solid-svg-icons/faMessage'
-import { faLock } from '@fortawesome/free-solid-svg-icons/faLock'
-import { faSquarePlus } from '@fortawesome/free-solid-svg-icons/faSquarePlus'
-import { faUsers } from '@fortawesome/free-solid-svg-icons/faUsers'
-import { faBackward } from '@fortawesome/free-solid-svg-icons/faBackward'
-import { faCommentDots } from '@fortawesome/free-regular-svg-icons/faCommentDots'
-import { faXmark } from '@fortawesome/free-solid-svg-icons/faXmark'
-import { faArrowRightToBracket } from '@fortawesome/free-solid-svg-icons/faArrowRightToBracket'
+import { library, dom } from "@fortawesome/fontawesome-svg-core";
+import { faEllipsis } from "@fortawesome/free-solid-svg-icons/faEllipsis";
+import { faBuilding } from "@fortawesome/free-solid-svg-icons/faBuilding";
+import { faUser } from "@fortawesome/free-solid-svg-icons/faUser";
+import { faPlus } from "@fortawesome/free-solid-svg-icons/faPlus";
+import { faAngleRight } from "@fortawesome/free-solid-svg-icons/faAngleRight";
+import { faAngleLeft } from "@fortawesome/free-solid-svg-icons/faAngleLeft";
+import { faChartSimple } from "@fortawesome/free-solid-svg-icons/faChartSimple";
+import { faLocationDot } from "@fortawesome/free-solid-svg-icons/faLocationDot";
+import { faCheck } from "@fortawesome/free-solid-svg-icons/faCheck";
+import { faAnglesUp } from "@fortawesome/free-solid-svg-icons/faAnglesUp";
+import { faPen } from "@fortawesome/free-solid-svg-icons/faPen";
+import { faPenToSquare as faPenToSquareSolid } from "@fortawesome/free-solid-svg-icons/faPenToSquare";
+import { faCalendar } from "@fortawesome/free-regular-svg-icons/faCalendar";
+import { faTrashCan } from "@fortawesome/free-regular-svg-icons/faTrashCan";
+import { faPenToSquare as faPenToSquareRegular } from "@fortawesome/free-regular-svg-icons/faPenToSquare";
+import { faCircleChevronLeft } from "@fortawesome/free-solid-svg-icons/faCircleChevronLeft";
+import { faCrown } from "@fortawesome/free-solid-svg-icons/faCrown";
+import { faAlignJustify } from "@fortawesome/free-solid-svg-icons/faAlignJustify";
+import { faMessage } from "@fortawesome/free-solid-svg-icons/faMessage";
+import { faLock } from "@fortawesome/free-solid-svg-icons/faLock";
+import { faSquarePlus } from "@fortawesome/free-solid-svg-icons/faSquarePlus";
+import { faUsers } from "@fortawesome/free-solid-svg-icons/faUsers";
+import { faBackward } from "@fortawesome/free-solid-svg-icons/faBackward";
+import { faCommentDots } from "@fortawesome/free-regular-svg-icons/faCommentDots";
+import { faXmark } from "@fortawesome/free-solid-svg-icons/faXmark";
+import { faArrowRightToBracket } from "@fortawesome/free-solid-svg-icons/faArrowRightToBracket";
+import { faHourglassStart } from "@fortawesome/free-solid-svg-icons/faHourglassStart";
+import { faFileImport } from "@fortawesome/free-solid-svg-icons/faFileImport";
library.add({
faEllipsis,
@@ -55,6 +56,7 @@ library.add({
faCommentDots,
faXmark,
faArrowRightToBracket,
-})
+ faFileImport,
+});
-dom.watch()
+dom.watch();
diff --git a/app/views/companies/new.html.erb b/app/views/companies/new.html.erb
index 8be694e1..dce77265 100644
--- a/app/views/companies/new.html.erb
+++ b/app/views/companies/new.html.erb
@@ -1,35 +1,31 @@
-