mirror of
https://github.com/IceWhaleTech/CasaOS.git
synced 2025-11-06 22:59:44 +00:00
Conflict Resolution
This commit is contained in:
a624669980@163.com
commit
e1c1db3b5c
33
DEVELOPING.md
Normal file
33
DEVELOPING.md
Normal file
@ -0,0 +1,33 @@
|
||||
# CasaOS Development
|
||||
Here we will describe the steps required to setup a development environment with CasaOS.
|
||||
|
||||
- [Setting up development environment](#setting-up-development-environment)
|
||||
- [Pre-requisites](#pre-requisites)
|
||||
- [1. Fork the Repo](#1.-fork-the-repo)
|
||||
- [2. Clone the repo down](#2.-clone-the-repo-down)
|
||||
- [3. Install dependencies](#3.-install-dependencies)
|
||||
|
||||
|
||||
## Setting up a development environment
|
||||
In this section we will walk you through the general process of setting up your development environment to get started.
|
||||
|
||||
### Pre-requisites
|
||||
The following must be installed in order to get started. The details of how to install them is outside the scope of this doc, but generally they should be able to be installed with your systems package manager (apt, yum, brew, choco, etc).
|
||||
- Go > v1.17.0
|
||||
- yarn
|
||||
- node.js
|
||||
|
||||
### 1. Fork the Repo
|
||||
[Fork the repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo) onto your own GitHub account for developing.
|
||||
|
||||
### 2. Clone the repo down
|
||||
1. Navigate into your go workspace (check with `go env GOPATH`).
|
||||
2. Navigate to the appropriate path for github. It should look something like this: `<path from GOPATH>/github.com/<GitHub Username>/`. If it doesn't exist create it.
|
||||
3. Clone down the repo with the following: `git clone --recurse-submodules --remote-submodules https://github.com/<your GitHub Username>/CasaOS.git`
|
||||
|
||||
### 3. Install dependencies
|
||||
1. `cd UI`
|
||||
2. `yarn install`
|
||||
3. `yarn build`
|
||||
4. `cd ..`
|
||||
5. `go get`
|
||||
2
UI
2
UI
@ -1 +1 @@
|
||||
Subproject commit c8aff6e5689ea3a2398dfc0fe2212ace1542dceb
|
||||
Subproject commit 7af1bf549dd35c93f48b6c501204a4efe57e8d6b
|
||||
@ -1,3 +1,13 @@
|
||||
/*
|
||||
* @Author: LinkLeong link@icewhale.com
|
||||
* @Date: 2022-07-01 15:11:36
|
||||
* @LastEditors: LinkLeong
|
||||
* @LastEditTime: 2022-07-01 15:16:00
|
||||
* @FilePath: /CasaOS/route/periodical.go
|
||||
* @Description:
|
||||
* @Website: https://www.casaos.io
|
||||
* Copyright (c) 2022 by icewhale, All Rights Reserved.
|
||||
*/
|
||||
/*
|
||||
* @Author: LinkLeong link@icewhale.com
|
||||
* @Date: 2022-05-27 15:55:36
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: LinkLeong link@icewhale.com
|
||||
* @Date: 2022-02-17 18:53:22
|
||||
* @LastEditors: LinkLeong
|
||||
* @LastEditTime: 2022-07-01 11:22:37
|
||||
* @LastEditTime: 2022-07-01 15:15:09
|
||||
* @FilePath: /CasaOS/types/system.go
|
||||
* @Description:
|
||||
* @Website: https://www.casaos.io
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
/*!**********************************************************************************************************************************************************************************************************************************************************************************!*\
|
||||
!*** ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/AcquaintanceShare/components/ListView.vue?vue&type=script&lang=js& ***!
|
||||
\**********************************************************************************************************************************************************************************************************************************************************************************/
|
||||
/*! exports provided: default */function(module,__webpack_exports__,__webpack_require__){"use strict";eval('__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");\n/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.string.includes.js */ "./node_modules/core-js/modules/es.string.includes.js");\n/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var _mixins_mixin__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @/mixins/mixin */ "./src/mixins/mixin.js");\n/* harmony import */ var _ActionButton_vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ActionButton.vue */ "./src/components/AcquaintanceShare/components/ActionButton.vue");\n/* harmony import */ var _ContextMenu_vue__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./ContextMenu.vue */ "./src/components/AcquaintanceShare/components/ContextMenu.vue");\n\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n\n/* harmony default export */ __webpack_exports__["default"] = ({\n components: {\n ActionButton: _ActionButton_vue__WEBPACK_IMPORTED_MODULE_3__["default"],\n ContextMenu: _ContextMenu_vue__WEBPACK_IMPORTED_MODULE_4__["default"]\n },\n mixins: [_mixins_mixin__WEBPACK_IMPORTED_MODULE_2__["mixin"]],\n data: function data() {\n return {\n items: [],\n min: 0,\n cols: 1000,\n colStyle: {\n width: \'\'\n }\n };\n },\n model: {\n prop: \'listData\'\n },\n props: {\n listData: Array,\n isLoading: Boolean,\n user: {}\n },\n mounted: function mounted() {},\n methods: {\n /**\n * @description: Download File\n * @param {Object,Object} event item \n * @return {void} \n */\n clickUserItem: function clickUserItem(event, item) {\n var bounced = event.target.getAttribute(\'class\').includes(\'mdi-dots\');\n\n if (bounced) {\n return false;\n }\n\n if (item.is_dir) {\n this.$emit(\'gotoFolder\', this.user, item.path);\n } else {\n this.$emit(\'showDownloadModal\', this.user, item);\n }\n }\n }\n});\n\n//# sourceURL=webpack:///./src/components/AcquaintanceShare/components/ListView.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options')},"./node_modules/cache-loader/dist/cjs.js?!./node_modules/babel-loader/lib/index.js!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/AcquaintanceShare/components/UserContextMenu.vue?vue&type=script&lang=js&":
|
||||
/*! exports provided: default */function(module,__webpack_exports__,__webpack_require__){"use strict";eval('__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");\n/* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.string.includes.js */ "./node_modules/core-js/modules/es.string.includes.js");\n/* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var _mixins_mixin__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @/mixins/mixin */ "./src/mixins/mixin.js");\n/* harmony import */ var _ActionButton_vue__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ActionButton.vue */ "./src/components/AcquaintanceShare/components/ActionButton.vue");\n/* harmony import */ var _ContextMenu_vue__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./ContextMenu.vue */ "./src/components/AcquaintanceShare/components/ContextMenu.vue");\n\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n\n/* harmony default export */ __webpack_exports__["default"] = ({\n components: {\n ActionButton: _ActionButton_vue__WEBPACK_IMPORTED_MODULE_3__["default"],\n ContextMenu: _ContextMenu_vue__WEBPACK_IMPORTED_MODULE_4__["default"]\n },\n mixins: [_mixins_mixin__WEBPACK_IMPORTED_MODULE_2__["mixin"]],\n data: function data() {\n return {\n items: [],\n min: 0,\n cols: 1000,\n colStyle: {\n width: \'\'\n }\n };\n },\n model: {\n prop: \'listData\'\n },\n props: {\n listData: Array,\n isLoading: Boolean,\n user: {}\n },\n mounted: function mounted() {},\n methods: {\n /**\r\n * @description: Download File\r\n * @param {Object,Object} event item \r\n * @return {void} \r\n */\n clickUserItem: function clickUserItem(event, item) {\n var bounced = event.target.getAttribute(\'class\').includes(\'mdi-dots\');\n\n if (bounced) {\n return false;\n }\n\n if (item.is_dir) {\n this.$emit(\'gotoFolder\', this.user, item.path);\n } else {\n this.$emit(\'showDownloadModal\', this.user, item);\n }\n }\n }\n});\n\n//# sourceURL=webpack:///./src/components/AcquaintanceShare/components/ListView.vue?./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options')},"./node_modules/cache-loader/dist/cjs.js?!./node_modules/babel-loader/lib/index.js!./node_modules/cache-loader/dist/cjs.js?!./node_modules/vue-loader/lib/index.js?!./src/components/AcquaintanceShare/components/UserContextMenu.vue?vue&type=script&lang=js&":
|
||||
/*!*****************************************************************************************************************************************************************************************************************************************************************************************!*\
|
||||
!*** ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/AcquaintanceShare/components/UserContextMenu.vue?vue&type=script&lang=js& ***!
|
||||
\*****************************************************************************************************************************************************************************************************************************************************************************************/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user