Merge branch 'develop' of https://github.com/hamster-shared/hamster-f…

…rontend into develop
hamster-shared · Nov 21, 2023 · 0197bb3 · 0197bb3
2 parents c6825e6 + a3ddc9c
commit 0197bb3
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 18 deletions.
diff --git a/.env.development b/.env.development
@@ -5,8 +5,8 @@ VITE_APP_TITLE=Hamster
 # VITE_APP_CLIENTID="9fce2a15f6df21849e20"
 VITE_APP_CLIENTID="Iv1.6d9972fa6afd1c02"
 # 02projects 14middleWare
-VITE_BASE_API="http://61.172.179.6:30314/api"
-# VITE_BASE_API="http://172.16.10.43:8080/api"
+# VITE_BASE_API="http://61.172.179.6:30302/api"
+VITE_BASE_API="http://172.16.10.43:8080/api"
 
 VITE_WS_API="ws://61.172.179.6:30302/api"
 

diff --git a/src/assets/icons/success-color.svg b/src/assets/icons/success-color.svg
diff --git a/src/views/projects/projectsCreat/components/ImportGitRepository.vue b/src/views/projects/projectsCreat/components/ImportGitRepository.vue
@@ -9,18 +9,64 @@
     <ImportInstall v-if="!isGithubInstallCheck" @resetData="resetData"></ImportInstall>
     <div v-else>
       <div class="flex">
-        <a-select ref="select" class="select-btn" style="width: 340px" v-model:value="selectValue" placeholder="请选择"
-          :field-names="{ label: 'name', value: 'id' }" @select="selectGithubAccount" :options="githubAccountList">
+        <!-- <a-select ref="select" class="select-btn" style="width: 340px" v-model:value="selectValue" placeholder="请选择"
+          :field-names="{ label: 'name', value: 'id' }" @change="selectGithubAccount" :options="githubAccountList">
+          <template #label>
+            <span>
+              <user-outlined />
+              Manager
+            </span>
+          </template>
           <template #dropdownRender="{ menuNode: menu }">
             <v-nodes :vnodes="menu" />
-            <!-- <a-divider class="text-[#F4F4F4]" style="margin: 4px 0" /> -->
             <div class="border border-solid border-[#F4F4F4] w-hull h-[1px]"></div>
             <div style="padding: 4px 8px; cursor: pointer" @click="addGithubAccount">
               <plus-outlined />
               Add Github Account
             </div>
           </template>
-        </a-select>
+          <template #menuItemSelectedIcon>
+            <svg-icon name="success-color" size="18" class="ml-4" />
+          </template>
+        </a-select> -->
+        <div class="mt-5 mb-4 w-[100%] text-[14px]">
+          <a-dropdown :trigger="['click']">
+            <div
+              class="flex justify-between w-hull h-[52px] border border-solid border-[#45423D] rounded-[8px] mr-[20px] leading-[38px] pl-[16px] py-[6px] cursor-pointer">
+
+              <div>
+                <img :src="selectAvatarUrl" class="w-[38px] h-[38px] rounded-[50%] mr-[10px]" />{{ selectValue }}
+              </div>
+              <div class="mr-[20px]">
+                <img src="@/assets/icons/skx.svg" alt="" class="h-[7px] hidden inline-block up-tran">
+                <img src="@/assets/icons/skx1.svg" alt="" class="h-[7px] inline-block up-tran">
+              </div>
+            </div>
+            <template #overlay>
+              <a-menu>
+                <a-menu-item v-for="it in githubAccountList" :key="it.installId" class=""
+                  @click="selectGithubAccount(it)">
+                  <div class="flex justify-between">
+
+                    <div :class="selsectInstallId === it.installId ? 'text-[#E2B578]' : 'text-[#000000]'">
+                      <img :src="it.avatarUrl" class="w-[38px] h-[38px] rounded-[50%] mr-[10px]" />
+                      {{ it.name }}
+                    </div>
+                    <svg-icon v-if="selsectInstallId === it.installId" name="success-color" size="18"
+                      class="ml-4 mt-[9px]" />
+                  </div>
+                </a-menu-item>
+                <a-menu-item>
+                  <div class="text-center plus-outlined h-[42px] leading-[42px] text-[#666666]" @click="addGithubAccount">
+                    <plus-outlined />
+                    Add Github Account
+                  </div>
+                </a-menu-item>
+              </a-menu>
+            </template>
+          </a-dropdown>
+
+        </div>
         <a-input-search :loading="searchLoading" class="mt-5 mb-4 search-btn" v-model:value="searchInputValue"
           placeholder="Search here..." allow-clear autocomplete="off" @search="handleSearch"></a-input-search>
 
@@ -146,6 +192,7 @@ const apiUrl = ref(import.meta.env.VITE_HAMSTER_URL);
 const githubAccountList = ref([]);
 const selectValue = ref('');
 const selsectInstallId = ref('');
+const selectAvatarUrl = ref('');
 
 const repositorySelection = ref('');
 
@@ -157,12 +204,13 @@ const searchInputValue = ref('')
 let importUrl = ref([])
 let nameDupErrInfo = ref('')
 
+const installationsData = ref({})
+
 
 const VNodes: any = (_, { attrs }) => {
   return attrs.vnodes;
 };
 
-
 const importVisible = ref(false);
 const repositoryVisible = ref(false);
 const importFormRef = ref();
@@ -223,16 +271,14 @@ const pagination = reactive({
 });
 
 const addGithubAccount = () => {
-  // console.log('jkjkjk')
-  // window.addEventListener('message', resetRepositoryData, false)
+  window.addEventListener('message', resetRepositoryData, false)
   const state = new Date().getTime();
   const url = `${selectTargetUrl.value}?state=${state}&redirect_uri=${apiUrl.value}/projects/installations`;
-  // const myWindow = window.open(url, 'select_target', 'modal=yes,toolbar=no,titlebar=no,menuba=no,location=no,top=100,left=500,width=800,height=700s')
-  const myWindow = window.open('http://localhost:5173/projects/installations?setup_action=install');
+  const myWindow = window.open(url, 'select_target', 'modal=yes,toolbar=no,titlebar=no,menuba=no,location=no,top=100,left=500,width=800,height=700s')
+
 }
 
 const resetRepositoryData = async (event: Event) => {
-  if (event.data.origin == apiUrl.value) return
   // await getInstallationsAccount()
   console.log(event, 'RepositoryData更新列表1111')
   // pagination.current = 1;
@@ -265,8 +311,11 @@ const adjustGithubPremission = () => {
   const myWindow = window.open(url, 'select_target', 'modal=yes,toolbar=no,titlebar=no,menuba=no,location=no,top=100,left=500,width=800,height=700')
 }
 
-const selectGithubAccount = (value: any, item: any) => {
-  console.log(value, item, '9090')
+const selectGithubAccount = (item: any) => {
+  console.log(item, '9090')
+  // installationsData.value = item;
+  selectValue.value = item.name;
+  selectAvatarUrl.value = item.avatarUrl;
   selsectInstallId.value = item.installId;
   repositorySelection.value = item.repositorySelection;
   searchLoading.value = true;
@@ -279,8 +328,10 @@ const getInstallationsAccount = async () => {
     const { data } = await getInstallations();
     githubAccountList.value = data;
     selectValue.value = data[0].name;
+    selectAvatarUrl.value = data[0].avatarUrl;
     selsectInstallId.value = data[0].installId;
     repositorySelection.value = data[0].repositorySelection;
+    // installationsData.value = data[0]
     console.log(data, '999')
   } catch (err: any) {
     // message.error(err.message)
@@ -401,7 +452,6 @@ const handleDone = async () => {
 }
 
 onMounted(async () => {
-
   await getGithubInstallCheck()
 
 })
@@ -416,6 +466,7 @@ onMounted(async () => {
 
 .search-btn {
   :deep(.ant-input-affix-wrapper) {
+    height: 52px !important;
     border-radius: 8px 0px 0px 8px !important;
   }
 
@@ -432,6 +483,12 @@ onMounted(async () => {
     // border: 1px solid #EBEBEB;
     border-radius: 0px 8px 8px 0px !important;
   }
+
+
+}
+
+:deep(.ant-dropdown-content .ant-dropdown-menu) {
+  border-radius: 8px !important;
 }
 
 :deep(.ant-radio-wrapper span) {
@@ -446,6 +503,10 @@ onMounted(async () => {
   color: #C3C4C7;
 }
 
+.plus-outlined {
+  border-top: 1px solid #F4F4F4;
+}
+
 :deep(.ant-radio-wrapper-checked span .radio-sub) {
   color: #E2B578;
 }

diff --git a/src/views/projects/projectsCreat/metaMaskAuth.vue b/src/views/projects/projectsCreat/metaMaskAuth.vue
@@ -43,9 +43,6 @@ const initGithubInstallAuth = async () => {
   }
 }
 
-
-
-
 onMounted(() => {
   initGithubInstallAuth()
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,9 +43,6 @@ const initGithubInstallAuth = async () => { @@
       }
     }
     onMounted(() => {
       initGithubInstallAuth()
     })
@@ Expand Down @@